Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 18 Aug 2010 22:46:56 +0000 (22:46 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 18 Aug 2010 22:46:56 +0000 (22:46 +0000)

Trivial merge